Clear up some not using method