updater code cleaned up