Remove and simplify code.