cleanup after yoni