Clean up old code, reorder imports.
Add TODOs.