Code cleanup.
Removed renamed file.