Remove comments
Add getting hooks