Hook location cleanup