small changes to the makefile and remove unused junk