the clean logic is now a package