issue #5837 further refactor, remove installer