removing unwanted upstream changes