Remove circular dependancy on wallet creation.