acu69369 - Remove static references to sandbox.