Issue #2231949: removing load hooks and updating *_load functions