Code cleanup - remove unnecessary condition
code cleanup