small clean-up before merge