Removing some more api code