Continue to simplify and add a cleanup method for deployment archives