Clean up Contexts handling a bit