clean up: removed unnecessary methods and classes