move cleaning to form