ref: cb50dc7f33faf0dc0ce3781197d547b9a60f65ae
parent: 3b017784506b1cb26ee9f2e528a8df2cf9b30b7f
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Sep 13 14:04:32 EDT 2013
Minor clean up. Removed some unused code and minor cleanup / reordering. Change-Id: I4083ae56aeb8edfe9b85aa2f42a16aa28d19da94