Add term removing and skipping to conform to new api