cleaned up tsdb interface