Removed residual dependence from modeler