cleaning up phase 1