deleted unecessary commented out code
Merge remote-tracking branch 'origin/team1-it4-refactor' into team1-it4-refactor