More closure cleanup