removed uneeded if