Clean up to M2

This does not cover the new M3 coming out next week. Will do that once M3 lands for all.