Remove public use of Context