cleaning up more types