move cleanups
fix assertions