Added proper archive removal (debug code left to verify)