Use berkshelf and clean up.