Tiny reorder
Remove tests and implementation (in controller) for comparing mps