Cleanup + static batching