Removed un-used code
Minor changes,
Style cop fix with code analysis