ADEN-433 Fix mobile after cleanup