Remove unnecessary and problematic desktop services code