Revert "Deleting some old, unnecessary stuff"

This reverts commit 8f4710f98799df8704b07d7196feed11c3d98329.