Removed the calls to Octave