more compositor cleanups part 3