mobile update, removing legacy behavior