Fix some TODO's and remove the one which became irrelevant