simplify-mobile-management

Simplify mobile management