Fixes some mess left overs from merges / reverts. now all as was.