More cleanup, more work