Clean Feature #5 and #6

[Gregoshi]

Thanks for posting this samu.

Interesting that both clans trace their ancestry back to the same person.