refactor - remove some code