some cleanup in bumblr