Cleanup of add-image.py