Revert "finalizing some things"

This reverts commit 1a7eee255882da4ef5c107e07d9a8c5c66f7235a.