all: remove last remnants of JI