Cleanup enumerate use