improve code by removing unused classes and methods