Memory/SharedByValue cleanups