Removed unecessary if statment