Remove more dead and redundant code.
Merge pull request #987 from rohit-n/more-dead-code

Remove more dead and redundant code.