08-14-14 - remove little unused codes
Merge remote-tracking branch 'origin/master'