Remove hidden content (commented out), minor markup fixes

No content was changed