Remove TSDB requirement