Travis: Initiating build for commit '53c792c93ad56f7690c17a8abe3aeae6aad90bcf' on branch 'master': Merge pull request #5872 from craue/code-cleanup-3

code cleanup