A bit of clean-up from last merge