removed my mods - updated to latest upstream