#170 Cleanup for sanitization
- Resolves #170