Remove un-needed if statement