Cleaning up timing/demo