Remove unused model manager [RD-84]
Remove commented code, add TODOs [RD-84]