clean of unused variables, TODOs