Remove Context class