c++11
remove unused code
fix #2156