refactoring - delete unused code