fix(builder): delete images on destroy

fixes #2530
I just prefer explicit non-null comparisons whenever the language provides it.