Once we are happy with the feature (which so far it seems good!) we should remove the feature flag and tidy up any extra backend stuff that isn't needed.
/cc @andr3 @jramsay