This commit also removes some debugging code accidentally left in from the previous commit.
Attach a file by drag & drop or click to upload
