refactor, remove unused code