Continuing cleanups to platform_patch_dir and readying for release