Configuraiton Clean-up