Cleaned up Image field/upload.
More Cleanup, like video-field.