Cleanup
Some hooks are "core" hooks, so kept in TE class file
updated to-do (bug to fix)