Remove unused instances of file store