Remove left-over bits of extralib support