Removed the whole Makefile business for now