Merge pull request #3 from vktrgama/CleanUp

Clean up master
Remove all remaning dups