Refactored code and got rid of unused classes and files.