Big cleanup, update with MM