Improve clause to avoid including structures containing only repealed sections