Drop a couple of old unused classes