remove unused code
refactoring