Revert "mods from vanir"

This reverts commit 23d3c9cafaa3a13918895dea0caca33bd9cea31d.