Removed not needed if checks