Minor cleanup

Removed some unnecessary condition checks.