* remove superfluous TODO
+ better duplicate detection