delete unused file and change code more clearly