Housekeeping

Removed duplicated scripts for ICC use and simplified the Makefile