===> Cleaning for mlmmj-1.7.0