File Cleanup

Cleaning up duplicate and unused files.