Remove unnecessary conditionals

This need some rewrites. Starting with this one...