Clean up BlockStore (minor)