Cleanup

Cleanup unneeded files and put in some comments for future work