Buncha changes, removed unnecessary classes