Remove useless type and misleading message
update hooks