cleaned up m2