more cleanup for mobile