Also remove some disabled code and fix a few comment typos.
Attach a file by drag & drop or click to upload
