Fixed removing empty dirs, added symlink cleanup