fixes that remove unnecessary calls and possible incompatible device setup.