Remove some not used classes and interfaces to keep the library as clean as possible