Start cleaning up the FeatureStore story