Make sure it cleans up