make cleandata more strict