Security fixes + removal of unnecessary Hook