Also delete more dead code, add comments explaining how a function should be maintained.
Attach a file by drag & drop or click to upload
