Cleanup of 'Native' namespace