Removed duplicate associations and validators