work-in-progress immediate-mode removal