also starting to remove references from between cell and propagator, keeping them both as dependencies of naive-scalar-net only