Further cleaning of HS files. This is integrated in toolbox.