Remove not used classes and remove not working method call