cleanup phase 1