Remove unnecessary helper function.
Remove unnecessary cleaning code.