remove safeyaml some more