Move out to clean function