3d cleanup adding defocus

@Justint I asked a similar question here which might apply to your workflow.