More cleanup; more TODOs; more nulls