remove toolkit-only