Removing logging and speeding up timing