cleanup and add new configs