Removing obsolete unnecessary classes
Update archives