File cleanup
Also added missing htmlspecialchars_uni