Revert "mods from vanir"

This reverts commit 09d78ab7b1efd526870dd0657e8009e4cebac3bb.