tweaked ModelStruct
removed unused functions