tweaks

minor changes to addModel
removing some unused code