Revert "Misc"

This reverts commit b6d3066e4b4ce61df42ce233367b385777798490.