Remove more and simplify