Remove dead file.
Refactoring changes.