Removed some un-used lines
resolved conflict