removed an if block