remove dead/unused code
Google commit: 55ef343