Scope clean up