Removed archaic classes (how did I miss these?...)