Perhaps shippable
Thumbnail cleanup first pass