Removing redundant code.

Messy booleans.