cleanup
configuration-merging waypoint #2