still refactoring
Remove debug trace