remove debug
refactoring