I'm pretty sure these classes have been deprecated for a long time. We should remove them, and also the mappings.