Remove unused code
Add Makefile to handle all maintenance tasks