Simplify some log statements.
Fix a bug where removing an image wouldn't delete the thumbnail.