Cleanup up the use of UNSET vs undef