simplify setup of common mode hook. Remove files which just setup the hook.
Merge branch 'master' into work