thesis: Cleanups of todos/fixmes