Remove 2x2 matrix code for real!