cleaned up some TODOs and starting to remove template id from ringbuffer