Remove "echo" from hooks