Fixed a failed functional test for the new hooks functionality.
Merge pull request #418 from jdgarrett/hooksfix

Fixed a failed functional test for the new hooks functionality.
removed hooks functionality
removed hooks dependencies that were not removed in previous commit