Cleanup hooks
Merge pull request #172 from mmun/cleanup-hooks

Cleanup hooks