Load hooks cleanup
RDoc updated