Code cleaning for config management