Remove extraneous changes beyond avoiding the false positive warnings, since super.shutdown() is never expected to throw. Also remove redundant unit test.#3