remove duplicate code
Merge branch 'Issue1949' of https://github.com/TEAMMATES/repo into Issue1949