Remove unused field and warning
Merge remote-tracking branch 'origin/develop' into engagement
First working integration