cleaned code of stub todos, fixed imports.