Clean up of code from mobile phone compatibility issue

The following discussion from !44 should be addressed:

• @remon started a discussion: (+1 comment)

  @maarten, this MR currently satisfies the most urgent requirements but does not clean up the code. If you feel that merging this is urgent, you can remove the WIP status and perhaps postpone the code clean-up to another issue.