Cleaned some annotations