cleanup, removed unused classes