Minor Core Cleanup. Part II