remove last bits of immediate-mode usage