Added more cleanup for Berkshelf