clean up account model
clean up registration model
commit update some model annotations