Add cleanup functions to fix recursive loop and no such file raised by broken symlinks

Add cleanup functions to fix recursive loop and no such file raised by broken symlinks #3013