Cull back on the TODO