More app config cleanup