Simplification exercise
Fast abort
Upgrade sanity
Merge branch 'simplify'