Fixes to removing rdb hooks.