Clean-up redundant config