Ivory 14 06 acu157621 clean up system configurator code