Remove getting context instance as constructor args