update and remove code from desk2mob