more data clean up