Hooks development: post-merge finished. Clean Up