removed reliance on cubesolver.h