Remove .old files
Merge pull request #1076
Merge pull request #1076 in master