Updated for new model namespace.
Removed unused dep.
Added checkouts dir to clean target.