Better place for Remove Hook; Add/Remove working properly