cleanup imports and todo declarations