Clean up timing, docs