Cleaning up phase 1