#278 Removed HardwareWalletService from CoreService shutdown on switch to simplify behaviour overall and tidied up some code