Removed non-autoWaltraud related changes in branch