Another pass at context clean up.

@enisoc @aaijazi 
Should this be in init?

(just curious)