some tweaks and delete hooks