cleanup of TODO