Removed closures from ModelSet
Model is now built in Python and not SQL