Chore/mobile clean up

@settinghead all the e2e tests passed. Please review and merge. Thanks.