Electron Cellular.off() and Sleep Modes

I would like to get rid of the delay also.

@Bdub with the current firmware do we still need to use this to get the Modem to turn off?

  Cellular.on();
  delay(10000);
  Cellular.command("AT+CPWROFF\r\n");
  delay(2000);

From your post here: SLEEP_MODE_DEEP not working with SYSTEM_MODE(SEMI_AUTOMATIC)