Remove unused classes and coding standards fixes