Travis: Initiating build for commit 'ba70cfb04b2570e1bb432c3d46b61c1fa8021079' on branch 'master': Merge pull request #5847 from craue/code-cleanup-2

code cleanup