Move cleanup of old ctrl files where it works.