Cleaned out all but 3 omp statements. Might also have corrected a race condition in the space construction.


Former-commit-id: e0b9e6872f5388f09b94489c65869acc28e3eb7c