Some more studio cleanup