Cleaned up sandbox-clone