Clean up extra files after merge... how were these even still around?  Merge COMPLETE
14 files changed