Fixed more device

Please remove any console logs for debugging