Release 18 Prep Cleanup