Cleanup of TODO comments