remove duplicated header file and utilities.