delete unused header file, change function order