add commit and remove useless code