Cleanup

More Cleanup. Removed unused files.