cleaning up before upgrade to M3