removed classes already migrated to individual libraries