Undid some debug-only edits