CE-37: fix the issue by removing unnessesary hooks