Use flat images when resizing (again). Cleanup.
Increment filename during upload if duplicate