removing old methods
Merge branch 'master' of git@github.com:11791-01/project-team01.git