removed cruft from models