cleanup phase 2