Remove some changes that came to master form last merge