Clean unnecessary blank lines

Change-Id: Id683ccb9658e46d1a7db0192a065d3fa82e78ceb