Some cleanup after merge