Revert "More Things"

This reverts commit 8ef398223b6c6c04d8c588a07c8800627602e009.