Remove legacy MTP management!