Remove the stopchain flag logic