Cleanup of account creation/approval code.

Change-Id: Id8f0e30d01aba89e1303c6b0bf965b74d812619d