Remove some unneeded checks and some unreachable breaks
Merge pull request #431 from marco-c/remove_unneeded_ifs

Remove some unneeded checks and some unreachable breaks