Fix same path errors and delete useless files