Clean up code of config

clean up