minor cleanup of clutter introduced lately