Revert "DEV: put virtual methods in matrix class"

This reverts commit cd7fae514edf776b9d1a70ce10688d8042a6af8d.