Clean TODOs and fix dependencies.