Revert "Too much stuff"

This reverts commit be9146d58219820cf0e2c4f42c34e381f823db16.