Source code cleanup, no bugs

Change-Id: Idae12d0a08dba8fe095a125e5687afcf882e9ca0
Merge "Source code cleanup, no bugs"