Merge "remove not needed return and break"