fixed imports and removed old TODOs