more work and cleanup