ref: cba0a5db2b52ae814a56faaa6da4142d39daa55f
parent: 0bfcd30768ab07de5a2a28f872fae12bbabfd3fe
author: Dmitry Kovalev <dkovalev@google.com>
date: Tue May 7 07:56:26 EDT 2013
Removing unused code + little cleanup. Change-Id: I81c19a8f19cfb5c7183609656ade833d72feb500