Cleanup documentation and remove duplicate timer