State & Sandbox cleanup