WIP: simplifying sanitization. EOM