Remove todo marker.
Remove unused imports.
Fix checkstyle warnings.