cleanup of the TODOs