2.0

Removing deprecated methods and fixing broken tests