Add unclassified prefix.
Remove redundant file.
Fix some glitches in testing.