Added proper makefile instructions
Cleaned out unused code