Cleanup image setup so that ADDs occur later on.