Remove obsolete class
Merge branch '2.0'