Cleanup for importing into latest studio.