removed hooks that are not used
old stuff showing up again for some obscure reason