- refactoring, remove unused dependencies