Fix/more avatax cleanup

Merge back to master project.