issue  #2377:Del register/unregister function in .cpp and .h files