Delete some unnecessaries; Rename another