Cleaned unused files and class. Please clean and rebuild. Closed #2