cleanup config & switch to unite