Move cleanup before creation