remove debugging; retest for performance on mac/win