remove some unneeded
remove one more