clean up changes for batch 18