Begin cleanup in repository src/mp/rmg