removed if then