Fixes for bug#3657595 and removing useless 2 files from mabile app