WIP: Original simplify

harkrequested to merge
original-simplify into master

Merge request reports