Minor naming and comment tweaks
Remove deprecated methods from debug