removed some diff junk