Removed broken storable hooks, fixed duplicate refs