Lining up methods for removal on core api.