Clean up, loop uses partial now