old config merge back
clean up