clean up and switch to M3