Closes #121 - stop using account code prefix