Minod code clean-up after merging pull-request.