No software rewrite branch

Rewriting decision in separate branch multiplies project schedule time.