Revert "Add more AGNi support"

This reverts commit ef7987f58fc0128c957f5ad5be1f86325eac5732.
Add more AGNi support