Removed dead code and updated comments
Merge branch 'beta' of git@github.com:teamGaia/OneDrinkAway.git into beta