clean up: remove TODOs which were done