Remove the rest of the new api annotations