removed diff junk