remove extra '&&'