remove a couple of classes, move others to keep for reference for the time being