Removed superfluous conditionals