Cleanup and correct sandbox spec