Patch/symlink cleanup