delete garbage codes, and fix file name.
fix minor conflicts by merging.