Additional cleanup.

Signed-off-by: Alex Wood <abwood@gmail.com>