Refactor
Remove debug code