Cleaning up hooks