cleanup, removed unused classes and buttons