remove old old; wrap new stuff in cfg flag