removed useless if statement