More cleanup and another fix forBitcoin issue