This removes up various code/defines that was just commented out instead of being deleted.
Attach a file by drag & drop or click to upload
