Remove debug output
Refactor how names are sanitized