Cleanup on loops, functional, and mammals