Revert "More things"

This reverts commit 45a6515a19669dc7c55a823562e7cc852fb59181.