clean up and upgraded jeweler