Travis: Initiating build for commit '4c590805ab8fc6b65b2bb1397c3e147b5f469c65' on branch 'master': Merge pull request #5813 from craue/code-cleanup

code cleanup