MPS - clean-up