cleanup some missing returns in triggers