True, good catch  -- Also do we actually need cleanup? I don't see it called.