Data sanitization

@coenjacobs for .11