IMG-667 Clean up even if the user picks the x instead of the choose new button