Unused code can cause error for client contact while viewing client batches
Merge pull request #1360 from rockfruit/unused_code_causes_error

Unused code can cause error for client contact while viewing client batches