Don't depend on self
Clean up context code