cleaned Context constructors