make ind functions consistent in gauge removal
#221
+216
−178
Merged