Removed unnecessary code

Removed if-statements that evaluated things we already evaluated higher
up