Clean up sandbox code