Remove ack related TODOs
Fit into 80 columns