Remove some things deprecated in 2.0 and 2.1