Add forRemoval to deprecated annotations and add comment to point them to which method they should use

[zromano]

We want to remove all the code that was deprecated with release 2.0. To do this, we want to to first do a release with them all marked forRemoval and tell them what method to use instead.