Cleaned up always true if statement

Change-Id: Ic11a8009986d0787714c4f8ac18ed0fac568ae8c