Remove outdates todos.
Tweak sanitization rules.