Device-executable should lose matrix-based code-path

This is a follow-up for #54 (closed)

Blocks #72 (closed)