More config cleanup and context improvements