Strip down and simplify