Makefile works now

- Cleanup