removed cruft from model class. fixed to not record on undeployed decommission. improved var/accessor names