Cleanup whitespace and remove some overqualified and unused selectors

Change-Id: I60cc0cb9c54369b0b1e8b7a949babafdcb0f2aff
Merge "Cleanup whitespace and remove some overqualified and unused selectors"