Removed unnecessary changes that differed from master