Cleanup of configs that are not related to this branch