some more code cleanups, remove old methods and all hook calls