Cleanup: Scope state information