Remove deprecated code
Slightly nicer error messages