Cleanup after merge with upstrem