refactoring: unused stuff removed