Code cleanup in the sandbox