Removed end-of-line style comments.
Commented-out unused variables.