Stripped out comments

Not quite done yet.