Remove hook
Merge branch 'dev'