Remove remaining mentions of trail
Filter private class method instead of static
Update changelog
Migrate existing trails