Removed some annotations that are no longer needed