Remove redundant close() calls