Updates: Remove scenes from return variables of functions