Remove if-statements that are always true