Remove Context interface for simplify API