Removed an unused file
Updated the show call to info to be consistent
Changed couple of variable name as recommended in PR 1708
Removed unused import  statements