Adding zoo support
Removing trash