Cleanup.
Merge pull request #29 from lagoa/mrafsan/cleanup/duplicate

Cleanup.