Improving logging use
Removing accidentally checked in file
Merge branch 'develop' into feature/dashboards