Removing redundant code
Merge branch 'sjain7'