Frances/fix/studio outilne cleanup WIP

DO NOT MERGE.