fixed: comment out some code mistakenly