Config clean up