Remove left-over "if" statement