Quit spamming upload boxes
Commenting is a bit nicer, plus extra cleanup