Revert debug
Remove more debug code