Some resource clean ups in archive