chore(kernel/expr): cleanup

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
chore(kernel/expr): cleanup