Cleanup of the tar-store code.