move more func into mobile only mode
scripted update of code from master at 842d1a8 move more func into mobile only mode