Clean up NaCl wrappers