Take care of TODOs