Update storage location and cleanup