remove fixme's, they  / the solutions go into an additional branch