Better cleanup and use tagged version of moka