Homestyx hydra

R1:21286a723eb6

Lint slop and some cleanup.

Summary:

Test Plan:

Reviewers:

CC:
Repository: R1 hydra
Commit Date: Feb 22 2011