Cleanup now that popco2 and popco1 are in sync (other than communication)