DO NOT MERGE: cleanup on studio outline improvements