Finished cleaning up for phases 2 and 3