Removed unused code, fix test for cpplint