Removed unused classes and fixed coding standards