Refactoring.
Removed unused file.