Updated comments
Removing unused code
Merge branch 'tonyEdits'