Removed hints and labels from article model - these will be maintained
in the form
Update article hints and labels
Fix merge conflict