Cleanup more mess after @tagua