Can you verify that any of these 3 `elseif` statements are still necessary? The new rules should no longer require activity type specific rules.