[cleanup] Removed no longer needed annotations