remove unnecessary context argument on ctor