removed unneeded if statement