Cleaned up code that's not being used - Removed useless comments.
Merge remote-tracking branch 'origin/master'