debugging: Clean up
debugging: Adding object scope to catch rewrite