Simplify initialization/destruction logic even more