Finish re-applying my changes that Mattias accidentally backed-out.
Remove old backup files.