Fixed bug that popped up after a change to the API.
Removed timing stuff.