remove carrier related stuff and add more mtp fixes