Sandbox Plugin - cleanup