removing if condition which is now pretty much pointless