Remove some unused code
Remove some unused code

MozillaHive/HiveCHI-rwm,MozillaHive/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,MozillaHive/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,iamstephenliu/HiveCHI-rwm,MozillaHive/HiveCHI-rwm