moving cleanall to a class