Cleanup

Additional cleanup of debug values.