Revert "Add some stuff that doesn't work yet"

This reverts commit fb0d1aeea5ece9190b3a5f3e7e7b5901647f5d00.