Removed some deprecated code

I did some text search for @deprecate and removed what I though could be removed.

I also added some notes on some classes to specify when things should get removed (Basically 2.5).

BTW, Is it a rule to keep deprecated things for 2 major versions ?