Clean up context dependencies