@matley 
Regarding removing more `models` code: Thanks, I'll remove those as well.