Remove non bip specific accounts code!