So many fixes
Remove debug code