removed if condition