[cleanup] Remove some out-commented code
[documentation] Fix minor errors