refactoring: remove old shit
refactoring: add new shit