Moved everything that isn't being used into a deprecated group.