Remove duplicate APIs and state WRT spill objects.