Simplifying condition statement

Removing code that is not needed or never gets accessed