Revert "Finalizing stuff"

This reverts commit 5cba1a3642ce45a7054dc0d29411d7de50fa3771.