Updating to match core changes, and removing ops