Removed obsolete @Optional annotations.