Cleanup iterator component for issue #10
Cleanup memory component for issue #10