phase1: cleanup redundant steps