[Agave] Get rid of a lot of useless code