Merge "Remove deprecated code and comment."