Removed the helper functions to the nr-clib