id:223 - working on core updater code cleanup