Remove unneeded annotation and logging