refactor yamba6 relics