Re: Cleaning up hooks