cleanup, no longer using iorefs