Fixed unused imports and added a TODO