Remove all remaning dups
Merge pull request #4 from vktrgama/CleanUp

Remove all remaning dups