Simplify imports; split m2, m128; remove m9; simplify "before"