[refactor] Remove backward looking versions.