Few more non names removed