remove if block here, too