removes some TODOs in converter