cleanups/assertions/safety