more cleaning of mv protocol