Deleted deprecated classes and some associated deprecated code.