Cut out more
Merge branch 'simplify'