removed naacl stuff