Resolve archives problem
Remove dead code