Cleaned up orphaned files from bad merge.