Remove use of context.Configuration