Remove redundant #if statements and condition checks. Change-Id: Ic7885564f21730ca67279202a9bcd51f45a04414