New version of mabe - Also clean working directory