refactor: remove old classes