Fix/more avatax cleanup