Cleanup internals