Pruned unused dependencies
Added used, undeclared dependency.
Merge branch 'master' into WATERSMART-141
Squashed AFINCH namespace out of existence.
Killed weekend-ruining commented-out code.