Cleaned up remaining TODOs.