added flag to turn off MKL, removed some commented out code