configuration cleanup
initial
initial, readable