Update keywords
Remove debug logging