Remove volumes after build

Since these volumes are both unreferencable, and should be completely
reproducible by subsequent builds, they can be safely removed.

Built on #7672
Resolves #6993 which was closed but not dealt with.
You can remove this `else` by condition inversion.