Cleanup.
Merge pull request #1 from victorchandra/vivek-dev

Cleanup.