Cleand up with new configs