Update the afc cleaner to add more code