MPL Cleanup