Removed debug output
Merge remote-tracking branch 'origin/develop' into develop
Clean up unused lines
Merge remote-tracking branch 'origin/develop' into develop