removed if conditions