retype the code and remove two redundant file