refactoring: remove unused stuff4