removed unnecessary classes and pods