Remove the area logging
Merge branch 'develop'