Moved location of code for removing direct boot properties on image

Since the image meta was already getting updated in wait_for_completion()
it only made sense to move this code up there.