i dont want to be forced to use an ornament for my valk, noticed the same thing with raider, will it be removed, is yes, then when.