Changed Makefile to fit latest changes
Removed all unneeded changes