Cleanup timer code

Change-Id: Ie4ed6b96bab1f11f3e6d81c5b44818ce2252e87f
Reviewed-on: http://review.couchbase.org/32629
Reviewed-by: Brett Lawson <brett19@gmail.com>
Tested-by: Mark Nunberg <mnunberg@haskalah.org>