[REFACTOR] remove unused classes
[REFACTOR] revert
[REFACTOR] toolkit-view - delete unused classes