cleaning, changes for hook release