Removed andand gem and made some fixes