minor cleanup after previous merge