Code cleanup: removed unnecessary classes