Deprecation

Documentation changes to prepare v2.0
do we really want this?