Removed if conditions