Unset the custom-data node when it is empty

Closes #179