commit by huzl

1. Remove redurant codes.