Cleanup old Data structure/test.
Merge remote-tracking branch 'origin/master'
Cleanup old Data structure/test.