remove the if aroud simple isset checks