Cleans up some code; adds skip_sanitization_of methods