Tidy up header comments and delete some old TODOs