Remove previous hack for clearing up leaked file handles