remove unnecessary fields
fix class names
more data