rm obsolete code. add identity to data.