This includes a small cleanup: * Remove dead code. * Rename context to _context since it is not being used.