Removing some dead code and extra view creation.

b/21133230
3 files changed