refactor
delete uneeded classes