ChungHN commit source optimize code and delete file not used