removed difficulty #defines from removal