remove archive
More wild hacking
More fixes