Merge branch 'cleanup' into nightly (Followup to 14a49c73f3c2feb93e92fad566a00d55598b4ddd)