Stubed User and Account management.
General code clean up