gem updates, remove old optimization