VIVO-552 Reduce “memory leak” messages at shutdown.

Back out the changes - locks up on the develop branch.