Some cleanup before merge