simplify, remove redundant code