removed unused imports and generated TODO comments