simplify the code based on latest orchestra/memory.

Signed-off-by: crynobone <crynobone@gmail.com>