removed some references to account model