Removed --keep-comments option (would make tokenization difficult)