Stop storing the association on the field
Fix required check