Cleanup of saf-directory. Also update of template.part.php