Removing unused file and updating Makefile
Debugging a little (not finished yet, coming back to it on thursday)