Eigen integration and cleanup (no more triangles for now)