Remove some unneeded annotations and calls