Re: Cleanup of func step 1