Removed unecessary hooks