Removed unneccesary if