Fully moved over to new file store