tiny bit of cleanup from the conf merge