Remove all account code, not needed
0.1.16