Removed unnecessary conditionals

Fixing the previous commit (981a3ea).