NSS removal, some extra stuff still was left