transferred recently added cleaning to modelform

#376