Solve Todos and do cleanups