Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>