Merger: Minor: remove deprecated code fragments