Yeah looks that way. We should delete that code and close the issue once it’s gone in master