Simplify

ok to merge now.