Revert "Misc"

This reverts commit eb6d716376286ca45dfdfca8ea4b16b67edbe837.