Removes '0' values from avhnoa4 and avhnoa3
[skip ci] Closes #622. Closes #621