Cleanup post unite