Remove Shelly stuff