Clean up as part of fixing for external use with salt