Make sure we cleanup before clone