cleanup comments
remove unused hooks