phase one cleanup