Remove if statement