simplify pass 2