Cleanup since merger.