Architecture

Cleanup Sandbox internals

0 min