Unify code
Remove debug